Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Makefile: mutualize local and Dockerfile build opts #9776

Merged
merged 1 commit into from
Aug 26, 2022
Merged

Makefile: mutualize local and Dockerfile build opts #9776

merged 1 commit into from
Aug 26, 2022

Conversation

crazy-max
Copy link
Member

@crazy-max crazy-max commented Aug 21, 2022 •
edited
Loading

follow-up #9771 (comment)

Made some changes to avoid drifting with build opts between local and Dockerfile.

@thaJeztah We can then change https://github.com/docker/docker-ce-packaging/blob/43635c4329d15c3639d6b8693b653b7ea9818487/deb/common/rules#L27-L34:

	&& mkdir -p /usr/libexec/docker/cli-plugins/ \
	&& GO111MODULE=on \
		CGO_ENABLED=0 \
			go build \
				-trimpath \
				-ldflags="-s -w -X github.com/docker/compose/v2/internal.Version=$(COMPOSE_VERSION)" \
				-o "/usr/libexec/docker/cli-plugins/docker-compose" \
				./cmd

With:

	&& make build DESTDIR=/usr/libexec/docker/cli-plugins

Also fixes the cross goal that was not building the right bake target.

closes #9771
closes #9765

Signed-off-by: CrazyMax [email protected]

@crazy-max crazy-max marked this pull request as ready for review August 21, 2022 19:48
@crazy-max crazy-max mentioned this pull request Aug 22, 2022
Merged
@crazy-max crazy-max force-pushed the mutu-build-opts branch 2 times, most recently from 3941d00 to 92f2766 Compare August 23, 2022 11:54
thaJeztah
thaJeztah reviewed Aug 23, 2022
View reviewed changes
Makefile Outdated Show resolved Hide resolved
thaJeztah
thaJeztah reviewed Aug 23, 2022
View reviewed changes
Makefile Outdated Show resolved Hide resolved
nicksieger
nicksieger suggested changes Aug 23, 2022
View reviewed changes
Makefile Show resolved Hide resolved
This was referenced Aug 23, 2022
Closed
Closed
@crazy-max crazy-max force-pushed the mutu-build-opts branch 3 times, most recently from 2ce30f4 to e4dedda Compare August 23, 2022 21:50
thaJeztah
thaJeztah reviewed Aug 23, 2022
View reviewed changes
Makefile Outdated Show resolved Hide resolved
Makefile Outdated Show resolved Hide resolved
thaJeztah
thaJeztah reviewed Aug 23, 2022
View reviewed changes
Makefile Outdated Show resolved Hide resolved
thaJeztah
thaJeztah reviewed Aug 23, 2022
View reviewed changes
Makefile Outdated Show resolved Hide resolved
@crazy-max crazy-max force-pushed the mutu-build-opts branch 2 times, most recently from 3c5bee4 to 538b9a5 Compare August 23, 2022 22:27
@crazy-max crazy-max requested review from thaJeztah and nicksieger and removed request for thaJeztah August 23, 2022 22:28
thaJeztah
thaJeztah reviewed Aug 23, 2022
View reviewed changes
Makefile Outdated Show resolved Hide resolved
thaJeztah
thaJeztah reviewed Aug 23, 2022
View reviewed changes
Copy link
Member

@thaJeztah thaJeztah left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

(one last question #9776 (comment), but not a blocker)

do we need to try this one in docker-ce-packaging?

@crazy-max
Copy link
Member Author

do we need to try this one in docker-ce-packaging?

Yes good idea

@thaJeztah
Copy link
Member

do we need to try this one in docker-ce-packaging?

Yes good idea

I was about to start a branch, but let me know if you're working on that (otherwise we'll end up in a race condition 😂 )

@crazy-max
Copy link
Member Author

do we need to try this one in docker-ce-packaging?

Yes good idea

I was about to start a branch, but let me know if you're working on that (otherwise we'll end up in a race condition 😂 )

Feel free to do it and @ me

@thaJeztah thaJeztah mentioned this pull request Aug 23, 2022
Merged
@thaJeztah
Copy link
Member

There you go; docker/docker-ce-packaging#748 (hope it works with using branch-name as reference 😂)

thaJeztah
thaJeztah approved these changes Aug 23, 2022
View reviewed changes
Copy link
Member

@thaJeztah thaJeztah left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

CI on docker/docker-ce-packaging#748 is happy 🎉

LGTM, thank you!

@thaJeztah
Copy link
Member

Did a quick rebase, as this repo looks to have "PR is outdated" checks enabled, in case that's a blocker (rebase was clean).

@nicksieger I think your comment (#9776 (comment)) was addressed; see #9776 (comment), PTAL

nicksieger
nicksieger approved these changes Aug 24, 2022
View reviewed changes
Copy link
Member

@nicksieger nicksieger left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM, looks cleaner too, thanks.

@thaJeztah
Copy link
Member

just realised this was not included in the v20.10.1 patch release 😂 - I was updating the build pipeline with the expectation this was fixed, and things failed, then realised it was not merged yet. 🙃 🙈

@nicksieger
Copy link
Member

Sorry about that. Wasn't sure how soon @crazy-max was going to get back to this so I didn't think to hold the release up for it. I have no problem creating a 2.10.2 release sooner than later.

@thaJeztah
Copy link
Member

No need to rush; we patched the release scripts for 20.10.0 to make it work. I was just "wait? what did I mess up?" ooooooooh.. 😂

@milas milas merged commit 6965113 into docker:v2 Aug 26, 2022
@crazy-max crazy-max deleted the mutu-build-opts branch August 26, 2022 20:21
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@thaJeztah thaJeztah thaJeztah approved these changes

@nicksieger nicksieger nicksieger approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@crazy-max @thaJeztah @nicksieger @milas